One last merge conflict fix