Resolve conflicts so that tests work