Legal Area (detail + edit)
resolve merge conflict
Js