version 0.5.3.2, added auto correction of conflicts at pulling new revision