Add security
Fix merging conflicts