fixed back end merge errors