Cleanup
Re-added .wlapp
Solved conflicts
Removed .wlapp