Fixign the merge correctly