Global formatting fix
merging and fixing conflicts.