before branch merge