Merge with the Boilerplate plugin