Fixed Merge problems