Fixed file that were committed with conflicts.