Fix regression introduced in #219 conflict resolution