Failed merge
Better error handling