merging old changes