Fixed github default merge

see summary