moved everything
config changes
merge