Can't remember what this was, but I'll commit anyways
fixed merge conflict
Fixed merge conflict, again
Minor changes
changes