Fix merging #2