some cleaning
fixing conflicts