Yes, you can use both.. and I would recommend you to wait till the next week when the updated upgrade procedure should be released... there was a one issue which occurred under some circumstances so our developers had already been able to fix it, the new upgrade is now tested and it will be released in a few days.