Fixed merge errors
Fixed more merge issues