seed file
resolve conflict