check merging out...
check change gitignore
another fix to workspace xml