Merge with Fan (Failed at last commit)