added spending report activity
resolved conflicts