Minuses and godsgit statusgit status
Conflicts resolved