Fix merge conflict >:(
Add screen shot.