Merge "Remove duplicate entry"