cleanup conflicts, more refactoring needed