resolve merge conflict from 1550edde