refactor LastConflict
ref lc
Merge branch 'feature-LC' into develop