This indicates a merge conflict.  This needed to be corrected before a final commit.