initial commit: base example
first commit, first conflict