Fix Merging #3