Log Message: Revert last commit. According to wiz@ in private mail, CONFLICTS is needed for configuration files only.