fixing problems
fixed merge errors