pulled merge out to its own step