merge changes from base