settled merge conflic