fixing merge conflict
removed conflict comments
fixed problems from merge conflict
fixed incorrect redirect in handlemgmtform