merge with mainstream