delete shit
fixed the conflict