merge test.java e final controller