Friday's changes
Fixed conflicts