[TASK] Update Modernizr to 2.8.0
[MISC] Resolve merge conflict