Resolving merge confliting