merged version 1