only edit ad remains! ;)
Merge remote-tracking branch 'origin/master'