resolved revenueshare edit conflicts