consolidated files on MBPro, pushing changes