Fixed files that were committed with conflicts.