fixing history
fixing commit history