updates
solves merge conflict