adding line that got dropped in by-hand merge