just a simple repository to play around with merge conflicts