try to solve CONFLICT -_-||