Conflict Fixes