added solution
fixed merge