Resolve merge conflict with ptf branch