gambiarras
final merge