Beta merge test for conflicts