implement show file difference method
dropped conma
dropped conma 2
changed code
Remove show_diff method. Insted, create self.diff variable
Resolve merge conflict