added facility app to settings
removed merge conflicts