Updated Errors
Merge Fixed