Arafat

Results 1 issues of Arafat

### Expected Behavior Before Pull if I rollback the changes I already have made should not give us any merge conflict. Although in far previous version, small changes(like just API...

B-bug
S-unverified