ive been saying server 1 needed a merge since the start of server 1, hope its moving along timely