Time position changes
Conflicts resolved
Conflicts resolved