Merge conflic fix