fixing a warning
fixing conflits