fix of merge conflict in login