Removed merge comments from .gitmodules