Moving platform
Conflict resolve
resolve