fixing issue with windows
resolve conflict