sekhar - conflicts resolved in views