Something is wrong with your merge. This "<<<< HEAD " shouldn't be here.