Merge fail fixed