Fixed conflicts with lens HEAD