resolve merge conflict in BSD