fixed area calculation issue, started new measurement design
merging and resolving conflicts