Fixed Merge Errors