changes to resolve conflicts from branch merge