Fixed Merge Problems