merge change task modal and new task modal into one