Fixing mis-merge problems