Binary Files update

A few of the files are not synced correctly. This is just to align them.
Merge Conflicts

Trying to fix some merge conflicts