Resolving conflict - 006 (and commiting my changes)