Cleared out unnecessary "<<<<<<< HEAD", etc.