remove commited conflict