I think this is git messages indicate conflictnig. Clould you remove?