manual merge etc