So i had the choice of commit or push...lets see what happens....
Merge remote-tracking branch 'origin'