Clean manual merge