merge with no -ff
study python