dajesz rade
resolved confilct