merge changes from the previous version