Goal Added
Conflict resolved