fixing issues with commit/merge
still fixing issues