Manually try to solve a pull conflict