Fix FB bug
Fix conflict