Most updated version 6-19
Resolving merge conflicts