reverted to 06dff784. had commit a .git file that conflicted with current .git file