Cleaned Up Conflicts
Reverting Welcome Panel

At least it works.