removed merge conflicts from seed