removed extra code
merge