gitlab web ide resolve conflicts