Merge-o fix