fix some merge-related issues