added task add view
fixed conflict