a repo for learning how to resolve commit conflicts