Merge method fixes