resolve conflicts.
update 6.
add fsl property.