solved mergeconflicts
fix user seed