Merging fail fix