Attempting to fix conflicts.