Fixed remaining merge conflicts