adding accurate timestamps
merge conflict resolving