Resolved conflicts in jade files.