github resolve conflicts