Committing local before merge.
Resolving merge.