fix bad branch merge