Get latest code
Resolved conflicts