Removing line accidentally re-added in merge