download lates
fix conflict