Add MAP-3.
Solve conflict.