Rectifying my mistake when merging last time