Refactored merge conflicts part 2