You included merge conflict pieces here.  These need to be resolved then committed.