edit git bash
fetch + merge