replaced master with all_local_changes