fix seed
fix merge conflict, add missing image