current state
merged conflicts