Fixed wrong merge during rebase