Commit local changes prior to merge
Manual merge
Add dedicated frontpage view
Manual merge with upstream