trying to get analytics up
resolving conflicts