Adding a composer definition
Removing a merge conflict that someone committed