commit before merge working through client interface
trying to merge
still merging