Fix merge conflict
Javascript generator works with just ID's for now