Fix merging fail; oops!