pre-merge stuff