Resolvendo conflitos
Resolvendo conflitos nas features