think, you could pull latest changes from master. rebase this one of master and it should be good to go