fixing conflicts for merging