Remove the watcher
xctest?
Fix missed conflict in merge
More building++