conflict-resolution merge conflict, version 1. ##this how we change in github.com ##this is a different way to do things in read me