Manually merge olliehs commits