Dynamic profile picture change
Merge conflict