Goal handling done now
Solved conflicts