Fixed More Merge Errors