Remove git aliases
Merge conflicts
Add some git aliases
Fix more merge conflicts