Avoid .git conflict