Some changed may occur due to conflict solver