Repair conflict
Remove antiskill from git