Fixed merge confict