nothing changed
more pledge fixes
conflicts fixed