UPDATE!
CONFLICTS SOLVE