#Resolution of border issues