From local repo again
Fetched from github:
Manually merged