changed preload to none
added branch to config/production & config/staging
fixing conflicts