fix conflicts from #4