Fix merge of master branch