Implement merge with master branch so that we have the new problem