not sure why everything says modified
merge conflicts after pulling?