final stretch
merge completed