From Melissa
resolve merge conflict by alpha