Changes alert again
e enter the commit messagge for your changes. Lines starting
Resolve conflict