Fullscreen now has no border on XOPC
Resolve Conflict