fixing merge conflic