s 29 and s30 merge

millertime

Hmm both are me. Not sure why i have two different names. I don't recall making two accounts. Maybe i did on my cellphone. I don't play in those server anyway and most definitely have only one account in my server