remove user so that gitconflicts can be included without user details