Cleanup style and get rid of conflicts problems.

Signed-off-by: Garrett Cooper <yanegomi@gmail.com>
656 files changed