Yiannis, I think you need to rebase your branch onto master.