changes on jess' comp
fix conflict