Add conflicts

@kevinmook Sorry about the empty line changes