run build; fix conflicts