Fixed the AND-case in isGoalFulfilled
merge