adding information about version changes, finalising about page
resolving conflicts