highlander
fixed merge conflicts