conflicts now show up. fixed for the timeshift. TODO: unhardcode timezone