Conflict resolved - Fixed security hole