Fixed Merge Conflict

fixed seed file merge conflict