Merge "Remove duplicated entry"