some unnecessary lines from stashing/merging deleted