Fix the time
Resolve conflict