Added git-commands (again)
Merge conflicts resolved