all merged changes from pc