refatoring
merge