Beautiful compare analysis in progress
conflict resolved