updates
I hate Merge Conflicts :(
I also don't like it when the comand line doesn't pick up all changes