updating
fixed merge errors