fixed uncommited changed that keep showing up when we pull