Add seed to try to fix merge conflict