Fixed rebase / merge error