removed overline
-
Resolves merge conflict