removed 'head' which was added automatically by merge