fix branch merge problems