cleanup and url testing
resolving conflicts
fixing stuff that shouldn't show