Testing git conflicts