fixes conflicts with master