Fixed invalid/conflicting commits.