Fix points
merge