GIT-4 user1 conflict change