Conflicts: .gitignore src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js