fixed my name
merge