fixed merge errors

Some errors from merge are fixed.