Fix Merge error with SCREEN_WIDTH