Manage merge changings due to new laptop. this time, updating master branch