Transcoding Push
Resolve Merge Conflicts, Hopefully
More merge changes and slight edits
more merge conflict