Lease condition object updated to reflect the latest DB changes.
Resolve conflicts.