petes first commit
fix conflict