Conflicts between the forked version and the master.