fixing border conflict