Repository to test dealing with merge conflicts