method to merge dev branch