Fixed merge conflicts in several files.