How To Resolve Merge Conflict In Git Submodule