User edit profile fix
Add task real time 0 by default
merge conflict