Fixed the merge

It's merged now.