Manually added Bernhards changed after conflict.