removed Git commit conflict errors