merging up
fixing conflicts