fixed merge conflict for decoder