update seed file
fix conflicts