Did a manual merge