before pull
resolving conflicts
changing TimeOn constants