Trying to force manual merge (this is on master)