Fixing final conflicts

@adamggg