Windows open now
Merge Conflict resolved