Second merge attempt, build fails in dump