Remove comma after grant
add faeprofile_id to contact tag
Fix conflict