Fixing some wierd merge issues, there may still be some left