Working as a team using GitHub and handling and resolving conflicts in code