Correct conflicts. Version on master branch is now the last one and working.