Fixing more merge problems