Changed file description
Resolved conflict