resolving merge conflict HEAD text