resolved merge conflicts
odd git problem
merge conflicts
fund percent bar complete
resolved conflict
resolved conflict