it looks like you need to rebase or merge master