Fixing merge (duplicated case)