smit-pull: merging conflict of issue in progress