Fixed merged conflict