More bower conflict resolutions.