Bower conflict resolutions