fix conflicts
Fixes conflicts