merging.... animation bug, release mode build bug