Started financial plan
Fixed merge