Some Fixes to Conflicts