allowing clients to pick a time
fixing merge conflicts