current state
merged conflict