結果 : github resolve conflicts not working