Weird merge side effect fixing