Fixed merged mess