small remarks [2]
merge branches and removal conflicts