remove duplicated files from previous merge