fixed post-merge bugs