seeds and some extra stuff
resolving conflicts
still resolving one extra conffcit