Comment out zoomwin
Correct merge conflict in submodules