MULE-7909: resolving merge conflicts