removed dead code of fee calculation
fixed conflicts
fixed conflicts