fix after-merge issues