Commit before pull.
Conflict fix.