fixing conflicts
Fixing duplicated line