Fix some merge-related issues