Fixed Merge Errors

Works for me locally.