re-merge changes from branch