initial commit
fixed early conflicts