conflict test
fixed conflicts and removed comment
this is to test merge to master