fix conflicts for merge