made positions that are changed get precedence when there's conflicts; fixes #65