refacto templates remotes
conflicts resolved