I also had these conflict messages in my base file which I have pushed to master branch. Can anyone tell me how to solve this? It is causing SQL error in my query because I merge and resolve the same commit multiple times and I can't just remove it in the file.