merge conflict with aaron-dev resolved