updates
fix conflict
first commit