code cleanup
fixing conflicts