fixed merge
fixed compile problem with compiler compatability