Fix rebase master