Somehow these files have been removed while merging. I think you are better off rebasing this on top of master.