Merge take 2