Issue #63 - Make videos by default 1080p
fixed merge conflict