Adding Test2.rar - working merge but flickering