WIP -- patch up merge conflict