#366 - Merging by hand