GitHub repository: mdeceglie/conflict-res
Created: 2017-09-22T22:41:39Z
Description: for testing conflict resolution workflow