Merge conflicts of this files are solved.