merge conflict w upstream fixed