Minor merging mistake fix