initial cmmit
merge done?