Fix merge conflict with master branch