Areas

 Git

 Merge Conflict Resolution