docs temp - diff
conflicts resolving