resolved conflicts in jsp