example just something First commit for git merge conflict practice ?? this is where is the conflict will happen ?? stuff to create conflict from Todd and something new