Commit conflict changes linux version