Fixed Merge Errors

It now compiles