Fixed merged branch