Removed viewport metadata
fixed merge conflicts