Get rid of Remote2D Submodule
fixed merge conflict