Merge error fixed

Made an error when merging, now fixed