Fixed merged issues