Fix error rebase master