Fixed merged conflicts