Some Tweaking
Conflict resolcver