Cleanup bad merge artifacts in videojs