Correct wrong merge with dev branch