conflicts
merges
models up todaye
haiku works ish