Resolvng Merge Conflict and adding in Project Donate screen