pre-merge with adam