Blue 13 04 acu81679 resolve conflicts