fixed dock conflict