Merge changes from personal laptop