persisted bower conflict resolution