fix branch merge