FIxed merge errors