made minor changes to resolve conflicts