modified task alert
resolved conflict