Conflict fix
Documentation update
Version 1!