temporal
resolving conflicts
indentation