Merge with boilerplate