solve platforms conflict
solve conflict