commit before merge
still trying to merge