Fix bad convenience method
Merge conflict resolve