changes
fixed merge errors