Fixes more conflicts.