fixing conflicts while merging branches