FIxed merge conflict