when merging me changes, please copy ALL my files to your working folder or try to use git merge. Mereing the changes manually usually is not a good idea, since you may miss some changes. Added fixput operation