Added git-c{onflicts,urrent-branch}