Highlight current user
Fixed merge conflict