Pre merge (conflice).
Merge conflicts resolved.