slight refactoring
resolve conflicts