update branch by fixing conflict