Scalability: Above average - Intelligent Git Workflow and Merge Conflict Resolver