結果 : github resolve conflicts button not working