Removing tmp files from git.
Removed tmp backup.
Merging.