Fixing
Reset commit
Class
Merge