fix positions
merge