Fixing git conflict and re-applying the security method lost