init
merging complicts