Fixed merge caution.