Fixed merge conflic