Removing a line left accidentally after resolving merge conflicts.