Resources and merging error fix