another merge conflict fix from before