Testing merge functionality with Justin