some conflicted merges