Removed "Mixed Platforms" and fixed a merge issue