Merge with backout