Fix merge conflict in main outline