conflict resolution line-height
conflict resolution line-height
adding grid highlight support and Object.clone