dealing with merge errors for bower setup