gitingore to conflict