Corrected auto-applied merge conflicts in top.sls.
Moving top.sls to the master branch.
Merge branch 'development' into production