Testing conflicts with branch and merge