Fix merge conflict for real