initial commit of merged changes