logging enabled
resolving merge conflict