Update time stamp
Resolve conflicts