merge commit; it seems to work finally