1 line deletion

I removed the "<<<<<<<HEAD" line