resolve another merge conflict