fix iss2
add branch feature_resource
new feature add resource
update gitignore
fix conflict