Fix License conflict

LICENSE

@@ -199,8 +199,4 @@
    distributed under the License is distributed on an "AS IS" BASIS,
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
-<<<<<<< HEAD
    limitations under the License.
-=======
-   limitations under the License.
->>>>>>> e1a202f (Updated)