merge w/ git_enhancements