Auth and lock view
Fix merge