fee history added
resolved conflict

changed view class