Fixing merging issues
trying to nail down git issues