resolving conflict
convert view to jade