merging, fixing conflicts