it doesn't work as I want it to but I have to stop for today
Merge remote-tracking branch 'origin/master'