Remove git conflict artifact