Fikset merge conflict