fixed user show merge conflicts