add  All Tasks-List
fix merge conflicts