one more forgotten merge conflict