Reduce the number of resolution conflict warnings

I somewhat forgot about this, but already a while ago I did these changes that should remove all the warnings that do not relate to user-specified code.  Closes #310