fix rhys ref
resolve conflicts