Fixing conflicts due to merge