added goal
fixed merge conflict