resolve conflicts from Ian