crash fixes
fixing merge conflicts