Removed unnecessary .gitmodules file generated by merge