Fixed merged conflicts.