Fixed Merge

Merged the two correctly.