assignment works
fix conflict