manually merged levels into master