Merge error fixed on master branch