remove stray % that arrived in this file through a merge conflict