fixed additional merge errors