repaired Add, and repaired the ratio issue
fixed the conflicts