master: removed duplicates after merge