COnfigure app for windows
Merge conflicts