bring dev branch to the latest version of master