this is the merged version