changes to  post-merge for today