really fix merge conflict?