merging
fixing conflicts