final v1
merge fixed