fixing border confilct