added a few new lines to conflict