just temporary pull
resolving conflict
manager views linked to urls