F15 solve pull conflict