fixed a confict from merge