pre-merge commit