Fixed merge conflicts and formatted files.
Merge origin/master