Reworked merge conflict fix