Resolving conflict - 007 (and commiting my changes)