Modifying file
Fixing conflicts