Some tidy up of merges