add specific platforms for build
fix unresolved merge issue