Resolution of rebase conflict error