Refactored merge conflicts