fixing issues
fixing conflicts