Merge conflict crash 82