fixing merge breaking changes