manually merged old changes