Remove merge conflicts after upgrading to version 3.5.1