Updating git shortcuts
Merging conflicts