Fixed merged bug.