commited and from master