Fix regression introduced in #218 conflict resolution