Fixed merge cock-up (do they ever work!!)