Fixed merge conflict
Add read me for frameworks folder