Add "Show changeset details" on right click
Resolve conflict from master