Resolve git conflicts

Resolve git conflicts (Attention contribution)