fixing manual merge mistake (extra line accidentally left in)