Merge conflic resolved