add some tags and directors
fix conflict