commit with arbitrary conflict added, as learning demonstration
commit with issues resolved