commit before pull, and thats gonna hurt
merge