fix syntax error
change patches
fix collision