fixed datafixtures
solved merge conflict in jobadvert