conflict .. manually delete duplication