can open and close terminal
resolves conflicts, merges