actual merge, 12 hours later