Added some resources
Fixed merge