removed obsolete contributor/user stuff
conflict reso