remove conflict
Merge branch 'master' of github.com:szupie/TIDBF
add babies when ecstasy takes effect