Indent EV-1 and -2.
Solve conflict.