test git conflicts