I’d recommend to read the announcement threads every time you’re about to run an update.
From the latest announcement thread (This is a known issue):
For information on merging configuration files, I think the thread below is the best source around:
You were able to boot in recovery mode, that’s all you need to start fixing this.
Hope that helps! 
1 Like