Fixed merged