Fixed merge conflict in resource section