Fix merging #1