removing merge conflicts introduced in https://github.com/openMF/mifosx/pull/1174