[boost] unable to merge trunk