MULE-7909: Resolving merge conflicts