Fixed issue #221: After resolving all merge conflicts, it's not obvious the project...