testing git for code conflicts exercise