Resolved conflicts and JSLinted