resolving merge conflict