Fixed merge duplication