Update readme and resources
Fix merge conflict