please accept my solution
merge