fix post-merge issues