b3 changes
edits
fix conflicts