Trying to merge local version on new computer and Github version. Not as straightforward as it should be. But... probably *also* due to my "great" knowledge of Git...