camera implemented
resolving conflict