Fixed conflicts between commits.