merge conflit fixed