Edited...
Conflict resolved...