border issues resolution