solve redundant conflict.