Fix BlueLine merge