fixed merge/extend issue