Increased version
Documentation update
Conflict fixes