work on conflicts
more git docs