for windows
resolve conflict