GitHub repository: lexbonder/conflict-resolution
Created: 2017-10-20T16:39:14Z
Description: merge conflict demo