merge old changes