Making changes to name
Fixing conflicts