GitHub repository: markotomic93/GIT-CONFLICT-AND-MERGE-TEST
Description: this an test for how to create and solve conflict