current state
merge
minor changes