remove avatar to prevent merge error