Remains of a merge-conflict resolve here?