Prepare for merge
Fix merge conflicts
Add fa and images