various conflictfixes