Fixed merge conflit.