Fix Conflict Attempt #2