Fixed Merger Errors
Fixed Merge Errors