add goldenview submodule
fix conflict for .gitmodules