fixed original codegit statusgit status
fixing merge conflicts...
merged fix