Resolvendo merge com as paradas de igor