added query statement
resolved conflicts