Added user image.
Fixed merge conflicts.
Fixed more merge conflicts.