switching to merged version