actually, now the merge conflict is really fixed