platform shift
Resolved confilt