Fixed merged branches