Updated Java files in model
Fixed Merge Errors