fixing conflicts while merging branches
fixing conflicts while merging branches