Fixed bad merges I had because Eclipse's merge editor sucks