Fixed remaining merge conflict