#summary view
#resolve conflicts