Fixed merged errors