fix features conflict