cleaning up
fixing conflicts